bitkeeper revision 1.1159.211.1 (41d59c1fSxiohB7d3GeC-bDUXJ-1zw)
authorsmh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Fri, 31 Dec 2004 18:36:15 +0000 (18:36 +0000)
committersmh22@tempest.cl.cam.ac.uk <smh22@tempest.cl.cam.ac.uk>
Fri, 31 Dec 2004 18:36:15 +0000 (18:36 +0000)
Merge tempest.cl.cam.ac.uk:/local/scratch/smh22/testing/xen-2.0-testing.bk
into tempest.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk


Trivial merge